tests: trying to make them pass more consistently