Added additional cleanup for ulex-tests