Refactor test universe