Fix deprecated code
Made user trackable
Fixed couple of failures due to typo in completed_execution_for_generated_query factory
Minor update