Updates to test for ETROG-984