Removed need for sleep/delays in some tests