Updates to tests
Lots of new tests