Added a few small tests