Updated to include JUnit test