Fixed up make test-accumulator bugs