More converted tests
More tests converted; more tests removed.