Added tests (that don't function) and updated chunking functionality