Final touch and a couple of assertions