Changes to AppTest