JUnit added
wip