Moved diff to root
Removed old tests.
Cleanup and bugfix