Deltacloud changes merged, added more test cases, fixed failing ones.