Fixes test name and removes merge errors