Start working on JUnit tests... not sure if they work yet