This at least makes sure the tests don't fail any more. Possibly there should be more evaluation happening there.