Subproject fixes

make test works in BBPSDK with an updated CMake subtree. @rdumusc can you review the rest?