Updating AppTestCase to be 2.x compatible across the board