Converted tests to new format