Fixing unfortunate editing mishap. This reverts the last remaining test manipulation in commit 249df7cb and makes all existing unit tests pass with smart_holder as default holder.