Miscelaneous cleanup of utilities and debugging of resource and feature tests.