[ALOY 988] Update tests with new known-good code