Add in some new tests