modified all tests suite