Fix integration tests for new resolve approach