Start reworking some of the tests