Revert "commit test"

This reverts commit 75286aefeaaf9d672203f8df965960e869c9d1b1.
remove deprecated classes.
added test cases.