Added some new small tests