Changes to fix some tests