made more spec tests pass