converted more tests