Manual merge added tests