cleanup
Fixed tests, removed unused ones