Update dependencies
Remove should word from test names
Remove Firefox prefix and clean up code