Fix line length
Integrate Borja's feedback (and re-order properties)
Add test requested by Borja