Added new test cases and fixed validator issue