Added some waits to try to bolster the test