Refactor - cleanup

+ Cleans up 4 out of 6 integration tests that left dangling FKs
+ Replaces the StubAdminClient
+ Code review changes from the Bootstrap refactor