Issue #689 Fixed visibility of classes as defined by VisibilityTest