Fixed unit tests and expected values
Uses both branch and  universe/scope on instantiation