Adding basic admin integration tests. Tests running again.
All tests passing
Some code cleanup