Hotfix/10b

I went ahead and added the tests and fixes for tooltips (since I needed them anyways).