CSIT-576 HC Test: Improve SPAN test coverage