Merge "Make cli test namespace include test files"