Fix various integration tests 20141021