Update tests
Remove unused macro
Small improvements to consistency, avoid use of UN Doc No label on African Union cites