Fixed JUnit calls, added import