Slightly less broken tests.