Added new test to Highway model and applying corrections