Several fixes to AOL and tests

Nitpick: We use C-style comments `/* . . . */`