using new expected conditions, etc.

using new expected conditions, removing waitforalert keyword, adding
behavior driven definitions