Merge "Fix test to return expected value."