Update tests
Consolidate some macros, fix case title back-reference short forms