Proper structuring of testable code in context

[josefrichter]

shortly before midnight, but all tests written and passing now thank you all for help!