Add tests for 6.4