rename test classes and fix javadocs

rename test classes and fix javadocs