Foundation Init refactor and test