SI-668 External Status fix and add unit-tests
3 files changed