Samples/CPU-32 - Updated a couple more tests to new structure