Merge "Not using calculator from test" into tm-qpr-dev