New folder architecture for tests