TRUNK-3569: Modified test class