The prior PR didn't touch this directory because it was getting too big and I wanted the diff to be smaller for the test directory. Now addressing that. Signed-off-by: Yuval Peress <peress@google.com>