Several fixes to AOL and tests

:+1: