#94, adding UT, fixing method-not-supported issue