Index: tests/regression/Selection/Molecules/MoleculeById/testsuite-selection-molecule-by-id.at
===================================================================
--- tests/regression/Selection/Molecules/MoleculeById/testsuite-selection-molecule-by-id.at	(revision 7c958e3f7ce548c4bf2fc8abe3caa46d9990fd56)
+++ 	(revision )
@@ -1,85 +1,0 @@
-### 4. (un)select molecules by id
-
-
-AT_SETUP([Selection - Molecule by id])
-AT_KEYWORDS([selection,molecule])
-
-regressionpath="${abs_top_srcdir}/${AUTOTEST_PATH}/Selection/Molecules/MoleculeById"
-srcfile=box.xyz
-testfile=test.xyz
-targetfile=water_id4.xyz
-AT_CHECK([cp -n ${regressionpath}/pre/$srcfile $testfile], 0)
-AT_CHECK([../../molecuilder -i $testfile -I --select-molecule-by-id 4 -s $targetfile], 0, [stdout], [stderr])
-AT_CHECK([diff -I '.*Created by molecuilder.*' $targetfile ${regressionpath}/post/$targetfile], 0, [ignore], [ignore])
-
-AT_CLEANUP
-
-
-AT_SETUP([Selection - Molecule by id with Undo])
-AT_KEYWORDS([selection,molecule])
-
-regressionpath="${abs_top_srcdir}/${AUTOTEST_PATH}/Selection/Molecules/MoleculeById"
-srcfile=box.xyz
-testfile=test.xyz
-targetfile=empty.xyz
-AT_CHECK([cp -n ${regressionpath}/pre/$srcfile $testfile], 0)
-AT_CHECK([../../molecuilder -i $testfile -I --select-molecule-by-id 4 --undo -s $targetfile], 0, [stdout], [stderr])
-AT_CHECK([diff -I '.*Created by molecuilder.*' $targetfile ${regressionpath}/post/$targetfile], 0, [ignore], [ignore])
-
-AT_CLEANUP
-
-
-AT_SETUP([Selection - Molecule by id with Redo])
-AT_KEYWORDS([selection,molecule])
-
-regressionpath="${abs_top_srcdir}/${AUTOTEST_PATH}/Selection/Molecules/MoleculeById"
-srcfile=box.xyz
-testfile=test.xyz
-targetfile=water_id4.xyz
-AT_CHECK([cp -n ${regressionpath}/pre/$srcfile $testfile], 0)
-AT_CHECK([../../molecuilder -i $testfile -I --select-molecule-by-id 4 --undo --redo -s $targetfile], 0, [stdout], [stderr])
-AT_CHECK([diff -I '.*Created by molecuilder.*' $targetfile ${regressionpath}/post/$targetfile], 0, [ignore], [ignore])
-
-AT_CLEANUP
-
-
-AT_SETUP([Unselection - Molecule by id])
-AT_KEYWORDS([selection,molecule])
-
-regressionpath="${abs_top_srcdir}/${AUTOTEST_PATH}/Selection/Molecules/MoleculeById"
-srcfile=box.xyz
-testfile=test.xyz
-targetfile=id4_missing.xyz
-AT_CHECK([cp -n ${regressionpath}/pre/$srcfile $testfile], 0)
-AT_CHECK([../../molecuilder -i $testfile -I --select-all-molecules --unselect-molecule-by-id 4 -s $targetfile], 0, [stdout], [stderr])
-AT_CHECK([diff -I '.*Created by molecuilder.*' $targetfile ${regressionpath}/post/$targetfile], 0, [ignore], [ignore])
-
-AT_CLEANUP
-
-
-AT_SETUP([Unselection - Molecule by id with Undo])
-AT_KEYWORDS([selection,molecule])
-
-regressionpath="${abs_top_srcdir}/${AUTOTEST_PATH}/Selection/Molecules/MoleculeById"
-srcfile=box.xyz
-testfile=test.xyz
-targetfile=box.xyz
-AT_CHECK([cp -n ${regressionpath}/pre/$srcfile $testfile], 0)
-AT_CHECK([../../molecuilder -i $testfile -I --select-all-molecules --unselect-molecule-by-id 4 --undo -s $targetfile], 0, [stdout], [stderr])
-AT_CHECK([diff -I '.*Created by molecuilder.*' $targetfile ${regressionpath}/post/$targetfile], 0, [ignore], [ignore])
-
-AT_CLEANUP
-
-
-AT_SETUP([Unselection - Molecule by id with Redo])
-AT_KEYWORDS([selection,molecule])
-
-regressionpath="${abs_top_srcdir}/${AUTOTEST_PATH}/Selection/Molecules/MoleculeById"
-srcfile=box.xyz
-testfile=test.xyz
-targetfile=id4_missing.xyz
-AT_CHECK([cp -n ${regressionpath}/pre/$srcfile $testfile], 0)
-AT_CHECK([../../molecuilder -i $testfile -I --select-all-molecules --unselect-molecule-by-id 4 --undo --redo -s $targetfile], 0, [stdout], [stderr])
-AT_CHECK([diff -I '.*Created by molecuilder.*' $targetfile ${regressionpath}/post/$targetfile], 0, [ignore], [ignore])
-
-AT_CLEANUP
Index: tests/regression/Selection/Molecules/MoleculeById/testsuite-selection-select-molecule-by-id.at
===================================================================
--- tests/regression/Selection/Molecules/MoleculeById/testsuite-selection-select-molecule-by-id.at	(revision f2872ae885ed8ca989001542d272c75794be73c1)
+++ tests/regression/Selection/Molecules/MoleculeById/testsuite-selection-select-molecule-by-id.at	(revision f2872ae885ed8ca989001542d272c75794be73c1)
@@ -0,0 +1,44 @@
+### 4. (un)select molecules by id
+
+
+AT_SETUP([Selection - Molecule by id])
+AT_KEYWORDS([selection,molecule])
+
+regressionpath="${abs_top_srcdir}/${AUTOTEST_PATH}/Selection/Molecules/MoleculeById"
+srcfile=box.xyz
+testfile=test.xyz
+targetfile=water_id4.xyz
+AT_CHECK([cp -n ${regressionpath}/pre/$srcfile $testfile], 0)
+AT_CHECK([../../molecuilder -i $testfile -I --select-molecule-by-id 4 -s $targetfile], 0, [stdout], [stderr])
+AT_CHECK([diff -I '.*Created by molecuilder.*' $targetfile ${regressionpath}/post/$targetfile], 0, [ignore], [ignore])
+
+AT_CLEANUP
+
+
+AT_SETUP([Selection - Molecule by id with Undo])
+AT_KEYWORDS([selection,molecule])
+
+regressionpath="${abs_top_srcdir}/${AUTOTEST_PATH}/Selection/Molecules/MoleculeById"
+srcfile=box.xyz
+testfile=test.xyz
+targetfile=empty.xyz
+AT_CHECK([cp -n ${regressionpath}/pre/$srcfile $testfile], 0)
+AT_CHECK([../../molecuilder -i $testfile -I --select-molecule-by-id 4 --undo -s $targetfile], 0, [stdout], [stderr])
+AT_CHECK([diff -I '.*Created by molecuilder.*' $targetfile ${regressionpath}/post/$targetfile], 0, [ignore], [ignore])
+
+AT_CLEANUP
+
+
+AT_SETUP([Selection - Molecule by id with Redo])
+AT_KEYWORDS([selection,molecule])
+
+regressionpath="${abs_top_srcdir}/${AUTOTEST_PATH}/Selection/Molecules/MoleculeById"
+srcfile=box.xyz
+testfile=test.xyz
+targetfile=water_id4.xyz
+AT_CHECK([cp -n ${regressionpath}/pre/$srcfile $testfile], 0)
+AT_CHECK([../../molecuilder -i $testfile -I --select-molecule-by-id 4 --undo --redo -s $targetfile], 0, [stdout], [stderr])
+AT_CHECK([diff -I '.*Created by molecuilder.*' $targetfile ${regressionpath}/post/$targetfile], 0, [ignore], [ignore])
+
+AT_CLEANUP
+
Index: tests/regression/Selection/Molecules/MoleculeById/testsuite-selection-unselect-molecule-by-id.at
===================================================================
--- tests/regression/Selection/Molecules/MoleculeById/testsuite-selection-unselect-molecule-by-id.at	(revision f2872ae885ed8ca989001542d272c75794be73c1)
+++ tests/regression/Selection/Molecules/MoleculeById/testsuite-selection-unselect-molecule-by-id.at	(revision f2872ae885ed8ca989001542d272c75794be73c1)
@@ -0,0 +1,43 @@
+### 4. (un)select molecules by id
+
+
+AT_SETUP([Unselection - Molecule by id])
+AT_KEYWORDS([selection,molecule])
+
+regressionpath="${abs_top_srcdir}/${AUTOTEST_PATH}/Selection/Molecules/MoleculeById"
+srcfile=box.xyz
+testfile=test.xyz
+targetfile=id4_missing.xyz
+AT_CHECK([cp -n ${regressionpath}/pre/$srcfile $testfile], 0)
+AT_CHECK([../../molecuilder -i $testfile -I --select-all-molecules --unselect-molecule-by-id 4 -s $targetfile], 0, [stdout], [stderr])
+AT_CHECK([diff -I '.*Created by molecuilder.*' $targetfile ${regressionpath}/post/$targetfile], 0, [ignore], [ignore])
+
+AT_CLEANUP
+
+
+AT_SETUP([Unselection - Molecule by id with Undo])
+AT_KEYWORDS([selection,molecule])
+
+regressionpath="${abs_top_srcdir}/${AUTOTEST_PATH}/Selection/Molecules/MoleculeById"
+srcfile=box.xyz
+testfile=test.xyz
+targetfile=box.xyz
+AT_CHECK([cp -n ${regressionpath}/pre/$srcfile $testfile], 0)
+AT_CHECK([../../molecuilder -i $testfile -I --select-all-molecules --unselect-molecule-by-id 4 --undo -s $targetfile], 0, [stdout], [stderr])
+AT_CHECK([diff -I '.*Created by molecuilder.*' $targetfile ${regressionpath}/post/$targetfile], 0, [ignore], [ignore])
+
+AT_CLEANUP
+
+
+AT_SETUP([Unselection - Molecule by id with Redo])
+AT_KEYWORDS([selection,molecule])
+
+regressionpath="${abs_top_srcdir}/${AUTOTEST_PATH}/Selection/Molecules/MoleculeById"
+srcfile=box.xyz
+testfile=test.xyz
+targetfile=id4_missing.xyz
+AT_CHECK([cp -n ${regressionpath}/pre/$srcfile $testfile], 0)
+AT_CHECK([../../molecuilder -i $testfile -I --select-all-molecules --unselect-molecule-by-id 4 --undo --redo -s $targetfile], 0, [stdout], [stderr])
+AT_CHECK([diff -I '.*Created by molecuilder.*' $targetfile ${regressionpath}/post/$targetfile], 0, [ignore], [ignore])
+
+AT_CLEANUP
