Fix up tests