Fix tests, clean up project files a bit