WIP switch to yaml v2

Several tests still broken.