Adds some new tests