Updated comment and pre-interaction tests with more cases.