Fix shape comparisons
Fix shape test
Fix assignment with arrays