Revert pull the minor test changes back in - they weren't at fault.

This reverts commit 9249c65783b3cf50d3b19dbc189939c28741e512.