Reverted changes break Test Cases