Converted more tests