Add test requested by Borja