Make testing with librarian-puppet work better