connectivity04 bug fix and unit tests.