Adapt test cases to new Marquise API