Updated tests such to use dict not arrays for value count