Initial work on management tests. squash me
Mostly working management tests YEAH... woohoo
further cleanup of management tests