Changing tests to handle thread numbers.