Add test case from Matthew for ac169edfcf