Change to 2000 threads
Changes on test design