Renamed project files and made tests work