added fix for set
added set test