Add tests for 6.9