Fixed the test macro name in the gtest CMakeLists
Fixed the rebase helper function to adhere to the new interface of isBelow and related functions
Merge pull request #6 from fberlakovich/upstream-fixes

Upstream fixes