Do we have or need tests for this logic?