Fix regression introduced by key paring logic, update incorrect usage test