remove unused app_service_store
fix flaky tests by not assuming order of arrays