remove setter conditionals, adjust tests