Undo some bad changes to bring the unittests back to work.
Undo some bad changes to bring the unittests back to work.

PortgasDAce/otrs,xhoy/otrs,StCyr/otrs,linearregression/otrs,brandonshults01/otrs,noritnk/otrs,nilei/otrs,mburggraf/otrs,MBRG/otrs,xhoy/otrs,linearregression/otrs,xhoy/otrs,thorsteneckel/otrs,moritz/otrs,PortgasDAce/otrs,mburggraf/otrs,vlascoder/otrs,brandonshults01/otrs,mburggraf/otrs,nilei/otrs,MBRG/otrs,muehlbauer/otrs,mbeijen/otrs-1,nilei/otrs,balazj/otrs,eliasp/otrs,rudy500/otrs,moritz/otrs,xhoy/otrs,vlascoder/otrs,mburggraf/otrs,crythias/otrs,balazj/otrs,MBRG/otrs,muehlbauer/otrs,brandonshults01/otrs,balazj/otrs,oiami/otrs,crythias/otrs,crythias/otrs,StCyr/otrs,eliasp/otrs,s7design/otrs,capeit-tto/otrs,moritz/otrs,MBRG/otrs,oiami/otrs,eliasp/otrs,brandonshults01/otrs,s7design/otrs,noritnk/otrs,linearregression/otrs,rudy500/otrs,moritz/otrs,eliasp/otrs,rudy500/otrs,rudy500/otrs,crythias/otrs,nilei/otrs,thorsteneckel/otrs,oiami/otrs,crythias/otrs,linearregression/otrs,StCyr/otrs,brandonshults01/otrs,nilei/otrs,xhoy/otrs,oiami/otrs,PortgasDAce/otrs,MBRG/otrs,StCyr/otrs,PortgasDAce/otrs,muehlbauer/otrs,capeit-tto/otrs,PortgasDAce/otrs,eliasp/otrs,thorsteneckel/otrs,s7design/otrs,noritnk/otrs,vlascoder/otrs,mbeijen/otrs-1,s7design/otrs,mburggraf/otrs,mbeijen/otrs-1,oiami/otrs,thorsteneckel/otrs,rudy500/otrs,muehlbauer/otrs,s7design/otrs,balazj/otrs,muehlbauer/otrs,capeit-tto/otrs,moritz/otrs,StCyr/otrs,linearregression/otrs,thorsteneckel/otrs,balazj/otrs