Merge "Remove duplication, split tests"