Moved dates to fieldval-dateval
JSON fix and test wording