Revert "Revert "test fix""

This reverts commit 8a6f67b028d0b0ad39ab48560a7002e9b7348b98.