rethreading for tests

Change-Id: Ie243f28b20d773fc2b7416f1382ceaf09e7cd42b