more tests fixes