More permissive keys.
Improve makefile.
Add new test case (yaml converted).