Refactoring infrastructure. Renamed names of service container and tests cases.