Refactor track test