Naming adjusted in test classes