This branch contains fixes (based on master) for the AE tests using the UpperTester. Minor issues and changed all tests to use setLocalResource and getLocalResourceAddress.