Commented out some unused code in the tests
Cleaning up luci-utility slightly