Added some new tests