Some old tests still failing because we changed structure. Working on client.