#AM-17 Choose tracking system - fixed typo and testing integration