More conversions of tests
Ported more tests