Better names and threading tests.