from code review: additional test