fixup test errors