Re-add integration tests
Fixes suggested by soltysh