Small refactoring in tests
Removed useless files