Add some more features to ThreadTest