Add a switch for the A/A test
Tidy up the A/A test conventions