threading macro update for tests