improved test libraries