Adding more tests
Moar testing
Inital port from project, needs more tests
Merge branch 'master' into develop