Adding new tests to Highway model and applying corrections