Resurrect integration tests
Merge review 329 by @mlucy @tryneus (close #517)