Get some acceptance testing in place so we can gut-check these admin changes.
Wrapping up #294 with some tests and a boatload of changes.