Index: tests/regression/Filling/FillVolume/post/water_cylinder.xyz
===================================================================
--- tests/regression/Filling/FillVolume/post/water_cylinder.xyz	(revision 6801f4f3b7ed127fa9a9c8afe64f82d34df963d2)
+++ tests/regression/Filling/FillVolume/post/water_cylinder.xyz	(revision 6801f4f3b7ed127fa9a9c8afe64f82d34df963d2)
@@ -0,0 +1,14 @@
+12
+	Created by molecuilder on Wed Sep  3 23:17:13 2014, time step 0
+O	8	5	2.50428
+H	8.7586	5	3.00857
+H	8.7586	5	2
+O	5	8	2.50428
+H	5.7586	8	3.00857
+H	5.7586	8	2
+O	2	5	2.50428
+H	2.7586	5	3.00857
+H	2.7586	5	2
+O	5	2	2.50428
+H	5.7586	2	3.00857
+H	5.7586	2	2
Index: tests/regression/Filling/FillVolume/post/water_undo.xyz
===================================================================
--- tests/regression/Filling/FillVolume/post/water_undo.xyz	(revision 6801f4f3b7ed127fa9a9c8afe64f82d34df963d2)
+++ tests/regression/Filling/FillVolume/post/water_undo.xyz	(revision 6801f4f3b7ed127fa9a9c8afe64f82d34df963d2)
@@ -0,0 +1,5 @@
+3
+	Created by molecuilder on Wed Sep  3 23:24:49 2014, time step 0
+O	0	0	0
+H	0.758602	0	0.504284
+H	0.758602	0	-0.504284
Index: tests/regression/Filling/FillVolume/pre/water.xyz
===================================================================
--- tests/regression/Filling/FillVolume/pre/water.xyz	(revision 6801f4f3b7ed127fa9a9c8afe64f82d34df963d2)
+++ tests/regression/Filling/FillVolume/pre/water.xyz	(revision 6801f4f3b7ed127fa9a9c8afe64f82d34df963d2)
@@ -0,0 +1,5 @@
+3
+ # test configuration, created by molecuilder test suite
+O       0.      0.      0.
+H       0.758602 0.     0.504284 
+H       0.758602 0.     -0.504284 
Index: tests/regression/Filling/FillVolume/testsuite-fill-volume-cube.at
===================================================================
--- tests/regression/Filling/FillVolume/testsuite-fill-volume-cube.at	(revision 6801f4f3b7ed127fa9a9c8afe64f82d34df963d2)
+++ tests/regression/Filling/FillVolume/testsuite-fill-volume-cube.at	(revision 6801f4f3b7ed127fa9a9c8afe64f82d34df963d2)
@@ -0,0 +1,43 @@
+#
+#    MoleCuilder - creates and alters molecular systems
+#    Copyright (C) 2014 Frederik Heber
+#
+#    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/>.
+#
+### filling various shapes
+
+# cuboid_impl::getHomogeneousPointsInVolume() is not implemented
+AT_SETUP([Filling - filling cube's volume])
+AT_KEYWORDS([filling fill-volume cube])
+AT_XFAIL_IF([/bin/true])
+
+file=water_cube.xyz
+AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Filling/FillVolume/pre/water.xyz water.xyz], 0)
+AT_CHECK([
+	../../molecuilder \
+		-i $file \
+		-o xyz \
+		-l water.xyz \
+		--select-all-molecules \
+		--create-shape \
+			--shape-name "cube" \
+			--shape-type cube \
+			--translation 5,5,5 \
+			--stretch 3,3,3 \
+		--select-shape-by-name "cube" \
+		--fill-volume \
+			--count 12], 0, [stdout], [stderr])
+#AT_CHECK([diff -I '.*reated by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Filling/FillVolume/post/$file], 0, [ignore], [ignore])
+
+AT_CLEANUP
Index: tests/regression/Filling/FillVolume/testsuite-fill-volume-cylinder.at
===================================================================
--- tests/regression/Filling/FillVolume/testsuite-fill-volume-cylinder.at	(revision 6801f4f3b7ed127fa9a9c8afe64f82d34df963d2)
+++ tests/regression/Filling/FillVolume/testsuite-fill-volume-cylinder.at	(revision 6801f4f3b7ed127fa9a9c8afe64f82d34df963d2)
@@ -0,0 +1,92 @@
+#
+#    MoleCuilder - creates and alters molecular systems
+#    Copyright (C) 2014 Frederik Heber
+#
+#    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/>.
+#
+### filling various shapes
+
+AT_SETUP([Filling - filling cylinder's volume])
+AT_KEYWORDS([filling fill-volume cylinder])
+
+file=water_cylinder.xyz
+AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Filling/FillVolume/pre/water.xyz water.xyz], 0)
+AT_CHECK([
+	../../molecuilder \
+		-i $file \
+		-o xyz \
+		-l water.xyz \
+		--select-all-molecules \
+		--create-shape \
+			--shape-name "cylinder" \
+			--shape-type cylinder \
+			--translation 5,5,5 \
+			--stretch 3,3,3 \
+		--select-shape-by-name "cylinder" \
+		--fill-volume \
+			--count 12], 0, [stdout], [stderr])
+AT_CHECK([diff -I '.*reated by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Filling/FillVolume/post/$file], 0, [ignore], [ignore])
+
+AT_CLEANUP
+
+
+AT_SETUP([Filling - filling cylinder's volume with undo])
+AT_KEYWORDS([filling fill-volume cylinder undo])
+
+file=water_cylinder.xyz
+AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Filling/FillVolume/pre/water.xyz water.xyz], 0)
+AT_CHECK([
+	../../molecuilder \
+		-i $file \
+		-o xyz \
+		-l water.xyz \
+		--select-all-molecules \
+		--create-shape \
+			--shape-name "cylinder" \
+			--shape-type cylinder \
+			--translation 5,5,5 \
+			--stretch 3,3,3 \
+		--select-shape-by-name "cylinder" \
+		--fill-volume \
+			--count 12 \
+		--undo], 0, [stdout], [stderr])
+AT_CHECK([diff -I '.*reated by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Filling/FillVolume/post/water_undo.xyz], 0, [ignore], [ignore])
+
+AT_CLEANUP
+
+
+AT_SETUP([Filling - filling cylinder's volume with redo])
+AT_KEYWORDS([filling fill-volume cylinder undo redo])
+
+file=water_cylinder.xyz
+AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Filling/FillVolume/pre/water.xyz water.xyz], 0)
+AT_CHECK([
+	../../molecuilder \
+		-i $file \
+		-o xyz \
+		-l water.xyz \
+		--select-all-molecules \
+		--create-shape \
+			--shape-name "cylinder" \
+			--shape-type cylinder \
+			--translation 5,5,5 \
+			--stretch 3,3,3 \
+		--select-shape-by-name "cylinder" \
+		--fill-volume \
+			--count 12 \
+		--undo \
+		--redo], 0, [stdout], [stderr])
+AT_CHECK([diff -I '.*reated by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Filling/FillVolume/post/$file], 0, [ignore], [ignore])
+
+AT_CLEANUP
Index: tests/regression/Filling/FillVolume/testsuite-fill-volume-everywhere.at
===================================================================
--- tests/regression/Filling/FillVolume/testsuite-fill-volume-everywhere.at	(revision 6801f4f3b7ed127fa9a9c8afe64f82d34df963d2)
+++ tests/regression/Filling/FillVolume/testsuite-fill-volume-everywhere.at	(revision 6801f4f3b7ed127fa9a9c8afe64f82d34df963d2)
@@ -0,0 +1,43 @@
+#
+#    MoleCuilder - creates and alters molecular systems
+#    Copyright (C) 2014 Frederik Heber
+#
+#    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/>.
+#
+### filling various shapes
+
+# everywhere_impl::getHomogeneousPointsInVolume() not implemented, then it would just fail
+AT_SETUP([Filling - filling everywhere's volume fails])
+AT_KEYWORDS([filling fill-volume everywhere])
+
+file=water_nowhere.xyz
+AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Filling/FillVolume/pre/water.xyz water.xyz], 0)
+AT_CHECK([
+	../../molecuilder \
+		-i $file \
+		-o xyz \
+		-l water.xyz \
+		--select-all-molecules \
+		--create-shape \
+			--shape-name "everywhere" \
+			--shape-type everywhere \
+			--translation 5,5,5 \
+			--stretch 3,3,3 \
+		--select-shape-by-name "everywhere" \
+		--fill-volume \
+			--count 12], 5, [stdout], [stderr])
+#AT_CHECK([diff -I '.*reated by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Filling/FillVolume/post/$file], 0, [ignore], [ignore])
+
+
+AT_CLEANUP
Index: tests/regression/Filling/FillVolume/testsuite-fill-volume-nowhere.at
===================================================================
--- tests/regression/Filling/FillVolume/testsuite-fill-volume-nowhere.at	(revision 6801f4f3b7ed127fa9a9c8afe64f82d34df963d2)
+++ tests/regression/Filling/FillVolume/testsuite-fill-volume-nowhere.at	(revision 6801f4f3b7ed127fa9a9c8afe64f82d34df963d2)
@@ -0,0 +1,42 @@
+#
+#    MoleCuilder - creates and alters molecular systems
+#    Copyright (C) 2014 Frederik Heber
+#
+#    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/>.
+#
+### filling various shapes
+
+# nowhere fails because there are no points
+AT_SETUP([Filling - filling nowhere's volume fails])
+AT_KEYWORDS([filling fill-volume nowhere])
+
+file=water_nowhere.xyz
+AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Filling/FillVolume/pre/water.xyz water.xyz], 0)
+AT_CHECK([
+	../../molecuilder \
+		-i $file \
+		-o xyz \
+		-l water.xyz \
+		--select-all-molecules \
+		--create-shape \
+			--shape-name "nowhere" \
+			--shape-type nowhere \
+			--translation 5,5,5 \
+			--stretch 3,3,3 \
+		--select-shape-by-name "nowhere" \
+		--fill-volume \
+			--count 12], 5, [stdout], [stderr])
+#AT_CHECK([diff -I '.*reated by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Filling/FillVolume/post/$file], 0, [ignore], [ignore])
+
+AT_CLEANUP
Index: tests/regression/Filling/FillVolume/testsuite-fill-volume-sphere.at
===================================================================
--- tests/regression/Filling/FillVolume/testsuite-fill-volume-sphere.at	(revision 6801f4f3b7ed127fa9a9c8afe64f82d34df963d2)
+++ tests/regression/Filling/FillVolume/testsuite-fill-volume-sphere.at	(revision 6801f4f3b7ed127fa9a9c8afe64f82d34df963d2)
@@ -0,0 +1,43 @@
+#
+#    MoleCuilder - creates and alters molecular systems
+#    Copyright (C) 2014 Frederik Heber
+#
+#    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/>.
+#
+### filling various shapes
+
+# sphere_impl::getHomogeneousPointsInVolume() is not implemented
+AT_SETUP([Filling - filling sphere's volume])
+AT_KEYWORDS([filling fill-volume sphere])
+AT_XFAIL_IF([/bin/true])
+
+file=water_sphere.xyz
+AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Filling/FillVolume/pre/water.xyz water.xyz], 0)
+AT_CHECK([
+	../../molecuilder \
+		-i $file \
+		-o xyz \
+		-l water.xyz \
+		--select-all-molecules \
+		--create-shape \
+			--shape-name "sphere" \
+			--shape-type sphere \
+			--translation 5,5,5 \
+			--stretch 3,3,3 \
+		--select-shape-by-name "sphere" \
+		--fill-volume \
+			--count 12], 0, [stdout], [stderr])
+#AT_CHECK([diff -I '.*reated by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Filling/FillVolume/post/$file], 0, [ignore], [ignore])
+
+AT_CLEANUP
