Adding waits to compensate for CircleCI