Change the unit tests to expect the new tabular format. Also generally clean up the tests -- refactor from a class to module-level functions as there was no need for a class here.