WIP - try to fix integration test#2