More Array Tests
Fix Array Breakages
Updated TODO