Continuous testing fixes