changes and updates to tests