Revert "Dev 4 rebase cp"

Reverts KaushikRay/Testing#6