[CDAP-774] Addressed review comments - method name changes, better tests