Why did you remove this and change all the assertions?