Fixed issue with race conditions in test further up the stack.

Fixed issue with race conditions in test further up the stack. #166