Removing threading remnants of older test