changed to new refi keys
fixed tests