Add some new tests