Switched around some stuff

Changed a few of the timing details so that it would not timeout the
tests