Add better support for manual app testing