Fixed merge conflicts in test package