Added Test file & changed error messages