Fixed project file, Array tests reorganized