more updates, mostly to tests