Updated test cases and Validation