Add the diehard and fips tests