Improved coverage on interaction tests