Partially fixed tooltip problem. Removed some tests that were not longer applicable.