fix up more spec tests