getting more set-related tests passing.