Minor changes and updates to DepartingTrain Unit test