Oops, fix a couple tests