Leadership integration tests

This is some refactoring to pull some requisite structures out of the main namespace.