Add tests for 6.5