Remove last Set occurences + Update spec_helper