Test fixes, and also the AOLSearchSource implementation