Unittest folder reorganized and test fixed 

The unittests and the testing resources are now reorganized, it is a bit more maven like and you can now run the unittests with maven.

The not working test is fixed