trying to fix integration tests (not there yet)