Separate tests from system and make them pass
Merge pull request #6 from jorams/test-suite

Separate tests from system and make them pass