several updates to tests