Updated all tests to use new statepoint format