For the unit test I chose to keep the original yaml file in place as a reference. This patch also includes a fix.