TestCases Created, and fixed some bugs