Added more TravStepAs tests. Refactored common code to TTravStep.