Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
#132 Moves exsisting unit test to their belonging package.
#132 Removes unused imports
Merge branch 'verhagen-132-move-unit-tests'