fixing tests in orchestrator and fixing NPE for AIRAVATA-1342