More unit test cleaning for Jenkins