Add tests for 6.3