renamed class name and some test methods.