FPLibraryTests cleanup