Fixed failing tests after control updates