More tweeks to get tests running consistently.