Test Fix

Some tests were intermitly failing after the maxwaittime was reduced in
an effort to reduce test run time. I upped the wait on the effected
tests