No extra threads in null message tests + whitespace fixes