Added some random waits

and also repeat the testsuite