Fix extant tests