Re-add some of the tests