Added new test to check that we can handle potential future formats