Update regex to exclude any min or max with inf in it

Change-Id: Iff172fe7d61bcaba436e036f328ce9a0a83d88d2
Reviewed-on: http://gerrit.causes.com/45132
Reviewed-by: Shane da Silva <shane.dasilva@brigade.com>
Tested-by: Shane da Silva <shane.dasilva@brigade.com>
Fix typo in zcount assertion exclusion clause

This was causing the tests to fail.

Change-Id: If7b4bb6c981f720905ae52867a3e1148a852199b
Reviewed-on: http://gerrit.causes.com/45133
Reviewed-by: Shane da Silva <shane.dasilva@brigade.com>
Tested-by: Shane da Silva <shane.dasilva@brigade.com>