#KJ-125 Fix threading tests. Some more test corrections.