Rewrote generic tests using libyaml. Expanded sink model.