Fix universe errors, update tests