[Tests, Refactoring]. Added some tests. Renaming.