changes that hopefully keep test from locking up

still not sure why it fails occasionally