AC: Progress on unit tests
AC: Cluster refactoring, rip out non-happy path integration tests, add unit tests