merging updates for fat_tree_test