Index: tests/regression/Selection/Atoms/AtomById/post/id01_missing.xyz
===================================================================
--- tests/regression/Selection/Atoms/AtomById/post/id01_missing.xyz	(revision f7c7cf132d69c7077ffd2cc11e7348c672217c01)
+++ tests/regression/Selection/Atoms/AtomById/post/id01_missing.xyz	(revision f7c7cf132d69c7077ffd2cc11e7348c672217c01)
@@ -0,0 +1,8 @@
+6
+	Created by molecuilder for select-atom-by-id
+H	0	1	0
+H	0	1	1
+H	1	0	0
+H	1	0	1
+H	1	1	0
+H	1	1	1
Index: tests/regression/Selection/Atoms/AtomById/post/id01_present.xyz
===================================================================
--- tests/regression/Selection/Atoms/AtomById/post/id01_present.xyz	(revision f7c7cf132d69c7077ffd2cc11e7348c672217c01)
+++ tests/regression/Selection/Atoms/AtomById/post/id01_present.xyz	(revision f7c7cf132d69c7077ffd2cc11e7348c672217c01)
@@ -0,0 +1,4 @@
+2
+	Created by molecuilder for unselect-atom-by-id
+H	0	0	0
+H	0	0	1
Index: tests/regression/Selection/Atoms/AtomById/testsuite-selection-select-atom-by-id-multiple.at
===================================================================
--- tests/regression/Selection/Atoms/AtomById/testsuite-selection-select-atom-by-id-multiple.at	(revision f7c7cf132d69c7077ffd2cc11e7348c672217c01)
+++ tests/regression/Selection/Atoms/AtomById/testsuite-selection-select-atom-by-id-multiple.at	(revision f7c7cf132d69c7077ffd2cc11e7348c672217c01)
@@ -0,0 +1,64 @@
+#
+#    MoleCuilder - creates and alters molecular systems
+#    Copyright (C) 2008-2012 University of Bonn
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+#    MoleCuilder - creates and alters molecular systems
+#    Copyright (C) 2008-2012 University of Bonn
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+### 6. (un)select atom by id
+
+AT_SETUP([Selection - atoms with specific id])
+AT_KEYWORDS([selection id atom select-atom-by-id])
+file=id01_missing.xyz
+AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomById/pre/test.xyz $file])
+AT_CHECK([chmod u+w $file], 0)
+AT_CHECK([../../molecuilder -i $file -v 3 --select-atom-by-id 0 1 -r], [], [ignore], [ignore])
+AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomById/post/$file])
+AT_CLEANUP
+
+
+AT_SETUP([Selection - atoms with specific id with Undo])
+AT_KEYWORDS([selection id atom select-atom-by-id undo])
+file=all.xyz
+AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomById/pre/test.xyz $file])
+AT_CHECK([chmod u+w $file], 0)
+AT_CHECK([../../molecuilder -i $file -v 3 --select-atom-by-id 0 1 --undo -r], [], [ignore], [ignore])
+AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomById/post/test-undo.xyz])
+AT_CLEANUP
+
+
+AT_SETUP([Selection - atoms with specific id with Redo])
+AT_KEYWORDS([selection id atom select-atom-by-id redo])
+file=id01_missing.xyz
+AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomById/pre/test.xyz $file])
+AT_CHECK([chmod u+w $file], 0)
+AT_CHECK([../../molecuilder -i $file -v 3 --select-atom-by-id 0 1 --undo --redo -r], [], [ignore], [ignore])
+AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomById/post/$file])
+AT_CLEANUP
Index: tests/regression/Selection/Atoms/AtomById/testsuite-selection-unselect-atom-by-id-multiple.at
===================================================================
--- tests/regression/Selection/Atoms/AtomById/testsuite-selection-unselect-atom-by-id-multiple.at	(revision f7c7cf132d69c7077ffd2cc11e7348c672217c01)
+++ tests/regression/Selection/Atoms/AtomById/testsuite-selection-unselect-atom-by-id-multiple.at	(revision f7c7cf132d69c7077ffd2cc11e7348c672217c01)
@@ -0,0 +1,65 @@
+#
+#    MoleCuilder - creates and alters molecular systems
+#    Copyright (C) 2008-2012 University of Bonn
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+#    MoleCuilder - creates and alters molecular systems
+#    Copyright (C) 2008-2012 University of Bonn
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+### 6. (un)select atom by id
+
+
+AT_SETUP([Unselection - atoms with specific id])
+AT_KEYWORDS([unselection id atom unselect-atom-by-id])
+file=id01_present.xyz
+AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomById/pre/test.xyz $file])
+AT_CHECK([chmod u+w $file], 0)
+AT_CHECK([../../molecuilder -i $file -v 3 --select-all-atoms --unselect-atom-by-id 0 1 -r], [], [ignore], [ignore])
+AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomById/post/$file])
+AT_CLEANUP
+
+
+AT_SETUP([Unselection - atoms with specific id with Undo])
+AT_KEYWORDS([unselection id atom unselect-atom-by-id undo])
+file=all.xyz
+AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomById/pre/test.xyz $file])
+AT_CHECK([chmod u+w $file], 0)
+AT_CHECK([../../molecuilder -i $file -v 3 --select-all-atoms --unselect-atom-by-id 0 1 --undo -r], [], [ignore], [ignore])
+AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomById/post/empty.xyz])
+AT_CLEANUP
+
+
+AT_SETUP([Unselection - atoms with specific id with Redo])
+AT_KEYWORDS([unselection id atom unselect-atom-by-id redo])
+file=id01_present.xyz
+AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomById/pre/test.xyz $file])
+AT_CHECK([chmod u+w $file], 0)
+AT_CHECK([../../molecuilder -i $file -v 3 --select-all-atoms --unselect-atom-by-id 0 1 --undo --redo -r], [], [ignore], [ignore])
+AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomById/post/$file])
+AT_CLEANUP
Index: tests/regression/Selection/Atoms/testsuite-selection-atoms.at
===================================================================
--- tests/regression/Selection/Atoms/testsuite-selection-atoms.at	(revision 6253ed4bcfa0dd23c33719d286276be9760ec373)
+++ tests/regression/Selection/Atoms/testsuite-selection-atoms.at	(revision f7c7cf132d69c7077ffd2cc11e7348c672217c01)
@@ -51,5 +51,7 @@
 # (un)select atom by id
 m4_include(Selection/Atoms/AtomById/testsuite-selection-select-atom-by-id.at)
+m4_include(Selection/Atoms/AtomById/testsuite-selection-select-atom-by-id-multiple.at)
 m4_include(Selection/Atoms/AtomById/testsuite-selection-unselect-atom-by-id.at)
+m4_include(Selection/Atoms/AtomById/testsuite-selection-unselect-atom-by-id-multiple.at)
 
 # (un)select atom by order
