[CDAP-778] Fixed unit tests