Fix some files
Get rid of old tests
Adjust PyCharm stuff