build fix
Revert "fixing test runtime issues"

This reverts commit 9d20134f75a337a7a5fe50179c0d343c22c7385c.