Merge "Using fixtures instead of deprecated mockpatch module"