Test Fixes

Fixed:
TestRemoveBatchNote, TestRemoveBatchAction, TestRemoveMeasurement,
TestAddBatchAction, TestAddMeasurement,

Pass:  110
Fail:  1