Improve AppCtrl tests