Moved the JUnit test utils into project