Fix issue 2070 - tooltip causes tests to fail