Update keyword functional tests
More JSON support
Refactor hash rockets to new syntax