Adding a couple extra assertions