Fixed Some Bugs and Tidy Up Perf
Fixed Test to use Add bulk