Make integration test a little better

Still pretty gnarly