My changes for tests