Fixes for updates to tests