Added a wrapper for array
Fixed the tests after the refactor