Fix some awkward tests