Several fixes to AOL and tests

:+1: this probably should've been added a long time ago