fix merge issue in pom dependency / test renaming