Added capture to cert tests
Added an override to require address
Added more cert tests