Remove test_cdap.py - duplicate file
Minor Refactor