make schema integ tests pass