DIAM-89 Refactor branches accordingly to new Structure, move BranchLogoType inside Branch Context
Fixed phpunit configuration file regarding last structure changes