Added missing classes
Simple ut
Fixed UT support