fixed ut
remove deprected code.
adding UT
increase coverage