Oops, fixing some broken tests