Add tests and documentation fixes for this change