Work on arrays
Fix
Add tests