Added updated userThread and tests