Fix
Some problems with integration tests