Removed dependency on Set::Object
Added more tests