Unit tests. Class rename