Tests: Enable tests due on this merge.