Testing ugly stuff
Shorter tests
Merge branch 'feature/awesometests' into develop