convert tests to new format