Changes to tests