More refactoring; Added accumulator test