Add tests for r204790