add testing for tracking