Added some tests...
Removed file that should not be there...