ADDED:more test case and related class files