CHANGED:Minor tweaks to tests