fix flakey tests