Adding some new tests