Added feature test
Amended the tracking code as per comments on the PR