Update toolkit for new tests