Added test to chunker and fixes after review