Fix broken tests which were previously skipped.