cc Updated messages.json file.
cc Updated makefile.
Fixed typo in makefile.
cc Made a couple of test cases valid.