Architecture change for tests