some changes for tests and methods