Sorting out some of the tests as I have broken them