Add tests for 6.7
Add tests for 6.8