Convert a few more tests
Rename old tests to avoid running them