Merge "large rework to optimize test code. removed lots of sleeps in favor of "Wait...