TestTrack02 modifications

additional minor tweaks.