Handle assertMatch macro
Better failure headers