Better IoC implemenation (using more dependency injection where possible without causing breaking changes)
Unit test fixes