more tests and minor fixes
Modified test data for adding merge/rebase tests

Additional work on add/remove/modifyfeatures methos