Merging test and fixing a bad merge