in progress tweaks to tests