rename classes

rename test classes