Merge "Clean up test files and db entries" into jb-mr2-dev