made more changes to tests