Added in TrainTests also made slight adjustment to logic of Departing
Train for a few methods