Merge branch 'company-tests' into 'milestone-2'

added company-service unit tests

See merge request !39