Test for new tracker – UPDATED