Working on tests, got mixed-array format to pass.