Fix tests

This should go in with LLK/scratchr2#1665