Fix broken unit tests, go through KeyPart to get expression for IN expression