Added more 406 tests, hand-verified some paths in the test data which now use macros