ye ye
renames, added UT, fix Single()