Renaming + added tests
removed useless file