Testing and fixing diamond dependency.