Fix the tests in the toolkit module