Fix tests for interactions
Merge branch 'MH-831' into dev