Added a few JUnit-tests, more to come