Several fixes to AOL and tests