improve main thread tests
organizing