Fix to Firefox test

Re-enabled this but didn't implement the workaround as suggested by Selenium. Should be passing now.
Merging origin/tbliss/master-pending/firefox-exception-testfix2 into master