tweak tests to help stop race condition