Update tests to better use librarian-puppet