Bug 17803 - Fix both test case and validation logic