fix the 'as' references in the tests