Fixing test for Firefox. Cleaning up