Several fixes to AOL and tests

Good catch