Renaming necessary to library
Adding test for library=true