Corrections on HighwaysController tests and adding new tests