Reverts commenting out broken tests