fixed more broken unit tests
fixed more broken unit tests
found another place where we were scaling up with the old-style node specification
fixed remaining unit tests, and passing keyname in when we add or remove roles