Jenkins tests

Fixed issues as per our discussion over the last pull request.