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