Improved test to cover 100% of the library