Update heuristics used to determine max state count, following a bug report from SAP. Updated tests to match.