Rename test files

In an attempt to slim down the POM file, I removed some custom
configuration of the Maven surefire plugin.  This causes the custom-
named tests to not run.  This change updates the names of the tests to
be standard.