Added Testcases and fixed comments from Nathan