JUnit with cleared errors from meeting with zayne. Final..