Test util tweaks
Fix up two tests