Updates to TestClass to make EclipseLink-friendly.