Several fixes to AOL and tests

:+1: for cruft removal