Fixed the rest of the erroring test cases. Please run the testcases before you commitgit statusgit status