Changed invocation of phpunit
Added datasource_filter_count twig function
Removed use of deprecated twig classes