Remove deleted files
Add tests