Added tests and corrected line length