#777 Added intermediate class to handle connection and enabled tests