Test fixes for Safari

A few trivial fixes making these tests pass with Safari.