refactoring
refactoring test method to output dictionary instead of list.
remove method from cpp_file_tools because original methods that where in bsc were changed