Added test
Removed unused files