Fix tests for 6.0.1