Test fixes (contribution soft credit, tweaks on previous fixes)