Relaxing visibility and fixing tests