refactor to explicitly state tooltip logic
additional tests