Fix up test whitespace and safety