Add a few assert statements