Merging DSP integration tests from api branch