Remove pre-wrap and test library of work