Just about there. One test failing for different format