adjust test cases to the new schema