Tests working with ioc

Now that Ioc is working properly the tests are passing.