Fixing failing tests on Safari/Mac

This commit fixes 2 failing tests on Safari/Mac after PR #589