AC: Code cleanup
AC: Split unit from integration tests, code cleanup