Added some more JUnit tests
Merge branch 'Tinkering' into dev