Fixed a few test flakes...