Added universe test
Merge origin/master