Updated the terminology used in the code Added test cases Changed the format of error/warning messages
Refactored some unit tests