[PATCH v2 0/4] test: Try to deal with some co-dependent tests