Unittest folder reorganized and test fixed 

The unittests are working now and you can run them by calling mvn test