CDAP-531: Add unit tests