Cleanup
Fixed tests, removed unused files.