Started writing JUnit Tests