Fix up tests a bit