refactored for clarity and correctness; added test for
CompanyService.removeCompany