fixing integration spec. Most specs are still failing.