Minor test pom and filename refactorings.