Test fixes to run on jenkins automation.