Fill in more tests
Merge branch 'develop' of https://github.com/galaxy-team/saturn into develop

Conflicts:
	src/test/tests.cpp