Simplify test task enhancement
Revise a bit