Updates to sorts and tests