495b97d
Re-enable some tests which should now be fixed. (cherry picked from commit 17233467ff5a50f812f1d431398df5bd6829c192)