Qa calls

Merging qa_calls into Master.
Also, please add a test.