migrate tests to new format