Small changes to CERT
Fixed CERT tests