small company/test changes
fixed merg conflicts