Updated stack orchestration and added unit tests