Bona Fide and Physical Presence Tests

Hi all,

I have two quick questions around these tests.

Does it count as "crossing international waters" for the physical presence test if you fly from the UK to mainland Europe (within EU)?

And is it possible to pass the bona fide resident test on a Tier 2 General visa? It's obviously not permanent, but I don't have any intention of moving back to the US. I had previously lived 7 years in Germany on temporary student visas before coming to the UK.

Thanks!!