[cdap-597] unit tests updated