Improve shovel tests
Improve test helper