Fixes to the tests. Needed because of earlier fixes for site compatibility.