added test cases.
removed unrelated classes.