Fix format tests to work with draft 3 and 4