Finish AppCtrl test improvements