Refactoring, added check answ tests