Added 3 test cases and more validation.