minor tweaks, updated integration test