revert 38fbd7a20f1ac40ef74675c4440c6bf40541de61 and bf573f272821cfcea0cc476028ec5b7172ddd141, then add comment for test execution