CONN-727: (TEMP) Removed unit tests