Librarian and testing cleanups