Todo resolved: additional unit test