Change test library to support the moved card factory and new deal
method