Added tests for when one line is having delays
Merge remote-tracking branch 'origin/master'