Some fixes & the base for new pinning tests