Several fixes to AOL and tests

Why change this?