more tests changes