Added unit tests or zone awareness