Add extra assertions