JUnit are running now but still need work