merging changes from datadog

re-ordering unit tests, adding files to gitignore