Fix up tests after last commit