Removed stubs for tests