Add tempdir add and remove
add to UEP in stub
UEP
UEP
More test stuff