switched back to arrays
fixed tests