Spliting tests
Refactoring code and cleaning
Change for Eclipse

Eclipse indexer detect this as undefinied type so i change it
Adding tests for new case + refactor