Fixed code style issues
made pytest compatible
Renamed source files and made tests run again