Convert all Consumer tests to the new test code