renmaed helper funcs
Fixed set test