This will make maintenance of fips tests easier. And will also allow to methodically test each mechanism as required.