Tidy up AOP testing stuff.