Merge "Add test to attach and detach policies with regular client"