move some not so shaky tests back to other suites

This pull request comes after https://github.com/Incubaid/arakoon/pull/108 .
I looked at the output of the shaky test suites and these tests no longer failed, or in the case of concurrent_collapse it's expected not to fail anymore.