#132 Moves exsisting unit test to their belonging package.
#132 Removes unused imports
Merge pull request #133 from verhagen/132-move-unit-tests

132 move unit tests