Update tests after syncinc with master