fixes to tests due to 3rd-party rake task description changes, 1.9.7 unordered hash issues, multilevel command design changes and a little bit of cleanup