Merge pull request #15 from team-umlaut/cleanup

Cleanup and add more tests.
Merge remote-tracking branch 'origin/master' into bootstrap