merging in updated selenium tests