Add EPV testing