Further tests

add more tests
switch to DI for testing
add some description