redifine tests and rename classes