Edited the project to work with JUnit