Modifications for Jenkins testing