Added a JUnit test and moved file