Fix some tests
Version bump to 6.0