Minor changes and updates to FreightCar Unit test