Refactored the tests
Started parsing chunks