Remove code to workaround #389

#389 was closed as part of the fixes in #751. This PR removes the various work-arounds we had in place in the tests.