Small test fix and reformat