Update tests to support second parameter as array