Removed unused CBuffer
correct indention
Corrected test