CDAP-610: refactored unit test