Track tests

Add tests for tracking, putting this in place before moving on to the main task of #62