Please add a test for https://github.com/gtorodelvalle/gaia/commit/407fdf575e27eded36ef33d76f6f37787fce201d#commitcomment-6228165