Lots of new data and some new tests