Improved settings for CI testing