add ability to categorize test data for functional tests (fixes #3404)