updates to unit tests and logic for accumulating