Update base and fix test suite