Review methods in new classes, also tests
Name of unit test methods fix
Comments teun fixed
Convert outside linq
Added a TODO for integration test
Revert "Added a TODO for integration test"

This reverts commit 89a859c5238ad6675b7687e8d79bb79ada9a06c9.
Added a TODO for integration test
Merge pull request #36 from Plenkske/master

Review methods in new classes, also tests