Improve shift/shovel tests