Added time filters and filter tests