(master) Update ALOY-963 test app to account for ALOY-1122 changes