add some new tests, break some things