Add formatting for test output; Revise match testing strategy