Finish the test suit that covers admin features and actions, clean up the indenting in various files.