fix unit tests which fail intermittently