Fix #15 fix the integration tests to go with this