Merge "Shaker CVP tests"