Last fixes in companies+multiproject tests. Time to merge in master.