Added more browsers to test.

Some refactoring.