Removed global variables. Array tests green.