Revert "change test util to return dict as result"

This reverts commit 88ab6b7a0e67e8dea79d86e02e77a468cb4f1626.