Did the TODOs and passed the JUnit test