Updated unit tests to match new dependency injection.