JIRA CEDL-129-130: SQLs to execute & unit test