Move tests to new format