FIX: Better app testing