Logic moved out of IoC container

Moved it into test logic, much nicer