Testing / Troubleshooting

Check that tracking works and fix common conflicts. 2 articles.