more changes to tests