reorganize library options and tests