CHANGE: minor changes to transition over to tracker testing