Removing unused test
Some refactoring and working on tests