Merge "Make test tool expose submodule sources"