WIP - try to fix integration tests