Merge "Fix magnification unit test"