A couple of fixes to tests