Array support. Test refactoring