fixes on pica amd tests