renamed thread
test updates
Merge branch 'master' into derk