Revert "Simplier testing way"

This reverts commit b61ed2507d9d7bcbc866486667212a6e314e3754.