BatchDataContext, Unit Test Updates

Added IBatchDataContext, fixed up unit tests