[TASK] Modified test cases to work with c&p adjustments