Several fixes to AOL and tests

Is this what was causing the 'File not found' errors?