Updating tests to use key as id