Updated tests with new format.