unit unit improvements to address the timeouts on jenkins