Fixing a merge conflic and adding tests