Changed thread handling from handoff to bounded queue
tweak to testing methods