Finished converting tests