Minor clean up of import statements
Added JUnit tests