Finished the test cases. Cleaning up

Change-Id: I465ddabbc0e3dd36798569fbea97927881e1bf6b