Fixed TrackTest problem