Added some new test