Some tooltip changes
Tests