Update to fix test suite