Add tests for 6.10