RichardH : fixing some more mysteriously broken tests