Merge "Update linter formatting, add new tests" into tm-qpr-dev