Fix up track emails, add spec to ensure it sticks. Fixes #47