updates to fix some tests