2.0.4 test fixes

Fixes for all tests cross-browser