Update tests to match new format