Updated Unit Tests because of name changes in control ID's