Technical debt for universe package
- refactored unit tests