This commit updated a few TODOs and changed the testing script to reflect the larger PSU count and to use rururb ratio sampling of 1.0.