Fixing broken tests and broken project file