a lot of changes, including working integration-test