fix array structure to make it easier to parse. update tests