Add multi-sample support to test fixtures