Ninject/UnitTest Refactor