Fixes #21
Started splitting apart test units
Merge branch 'develop' of github.com:galaxy-team/saturn into develop
Merge branch 'develop' into floppy-drive