[Tests] Update a few more statepoint tests

Starting to work through the hard ones now, progress likely to slow drammatically.