DS-991, DS-1034, updates to cross-app-tests