Updated tests for JSA

new definitions include, more than, less than, hover element, click element, wait, site actions drop down
I am not sure what the convention is either. 

What makes more sense:

Given that i am on blah blah
then I wait for drop down
then I should see something

or

Given I am on blah blah
when I wait for drop down
then I should see something

I have no strong preference but I feel the 'then' reads smoother.