Package naming re-style and added JUnit Tests