Added tests and removed line break preference