fix & update tests
fix extend of line on last measure