Fixed minor merge conflics
Minor test