Several fixes to AOL and tests

I would rather this test clean up after itself.