More test & array model fixes