Rework the tests to be inline with the new spec