Safari test fixes.
A few PhantomJS fixes.