Fix broekn beatrix tests after refactoring util tests