Add EPV to tests