Another tests + refactoring