Update tests for 6.6