Several fixes to AOL and tests

Mixed tabs and spaces here or something?