[nosdn-noha] Meet EPA testcases requirements - pt2