New version for tests