Fixed flakey unit tests