All simple tests migrated to new regex matching test harness