updates remaining tests to the new format