Reverted bad merge.

Revert "Fixed toolinfo to process result check properly #612"
Revert "Disabled gtest with #define"

Sorry.