Merge "Build TestablesTests as part of top-level make"