Add integration tests for Harvest + bugfixes