Adjust unit-tests for recent changes and jenkins