WIP: increase quality of integration test