Bug 975365 - Change to direct mapping and update testcase