Adds MergeAlgorithms tests and renames some classes