Fix indentation.
Correctly handle empty CData tag and add more test cases.
Use newer version of Whiskey for tests.