Fixes tests
Refactors a little but the arrayBuffer creation when parsing