When flipping the default to threadsafe, we never made sure that the
tests were building non-threadsafe variants. Specify which thead-safety
we want for each.