Refactored the chunk command tests a little bit