Revert "fix the 'as' references in the tests"

This reverts commit 5dc390b726add5b4d5a4cc952c3efb407ceca91c.
fix the 'as' references in the tests