add working test
moar tests
Finished tests
Merge branch 'feature/testing' into develop