date facet
date facet and test improvement
testing improvements and cleanup