Making free form company name/description work
Fixing broken tests