Fixed broken tests due to StructureMap intro