Adding tests
Removing files