132 move unit tests

Move the unit tests in the same package as where the classes are, that are under test.