Fix code style issues, use ContainerBuilder in lazy-loading test, do not instantiate services in removeListener, if not necessary