[CDAP-1076] Fixed broken unit tests