Added validation
Made validation test more conclusive