Add tests for 8.4