Merge "Make test work when running ndebug."