remove 3D vestiges in test names
simplify a test now that we require Java 7