CONN-200: Added unit tests