Fix integration tests for new framework