#KJ-125 Fix threading tests. Fixed the remaining 2 tests after a brief overview.