Improve appmaneger tests