Librarian tests simplified.