Adding new test to Highway model and applying corretions