Fix for 1-0:1 with shared pk attach bug + Addl tests