CONN-355: added unit test and provided bug fixes.