-fixed bug in matching_line_iterator
-more test coverage