Adding unit tests (uses JUnit)