Travel restrictions from Scotland / tests / Paperwork

Hi

Travel restrictions from Amber countries from Jul 19th will not require 10 days quarantine in Scotland

We are both fully vaccinated with paper copies from NHS of vaccinations

As i understand it:-

Travelling from Scotland to Spain, 

We don't need a pre departure covid  test as we are fully vaccinated.

We require to fill out a Spanish Health Control Form

We uploaded our NHS letters to Ryanair And boarding passes show "COVID DOCUMENTS UPLOADED"

To return to the UK

Covid test before departure - will find a local testing facility - any email contacts / recommendations?

Fill out UK Passenger Locator form

have arranged day 2 after arrival covid test.

I see Ryanair boarding passes show "NO COVID DOCUMENTATION UPLOADED"

Is that other people's understanding? or anybody had much experience of travelling into Spain lately?

Thanks